updates by moaty