Motified to comply with PR requests