Using my code, have to clean it up