Updated methods, added variable construction