still trying to fix..in class