Following Shalot's recomendations