Updated rules engine on client