Moved code to wrong place