Added some more changes to accomodate shift