Final Fix, make sure everything works