ADDED: More comments and things to remove in final check