Added some awesome suggestions from Andres