removed old ints and replaced with classes;