Moved code from drawer to cube