second commit of emma's project