added the rest of the things