uniform class now working