build3 modified by hamza