Preparing roation fix and removing loop.