fix object oriented stuff