Added my suggestions