Updates with feedback from immoh