missed some more stuff!!! WTF?!?!?