done but with bugs