changed class layout a bit