big fixing, validation