updated as per comments