fixed all buggs work