final commit before code condensing