Small modification for ease