Version 2

Completed 2nd version