Done task but with bugs