Reworked and Updated to prototype #2