better
Client side stuff done