Requested changes by negesti