updates after hw review