Revisioned after feedback