Moved items around for better use