Updated as requested in the pull request discussion (make it lighter)