Pending changes from last hackathon