Small bug left but DONE