More noobe changes