Still have some wierd mistakes