Addressed nomis52 comments