Version 2

Updated everything