Updated a couple of methods