removed code that created some bugs :3