Implemented naughty feature - return to arrangement