Updated after some feedback