first commit with working modifications