Code reviewed and build updated