Checkpoint:Everything works but needs some enhancements