Applied first code revisions