Version 2

Version 2 with more functionality