Converted so that everything is on same class