Changes according @daschuer comments.