Complete - less bug checking