some edits after testing on unit