fixed noob stuff