Add suggestions from @staticfloat