Fixing delay properly and moving things into the right positions