Final Client side version
Adding less support