temporary comments removed, and shorter code