Updated build
Added comments