Awesome, added some bugs