Updated to remove dependancies