changed noob code