reworked initial commit