Changes from Joey

Some stuff for Rats