New commit with changes

changed some aspects based on critique