Quick and dirty update, will readd changes next