done with build 1 & commenting