changes as per @coonsta suggested