gutted some validation