made obj oriented (a bit)