Fixed :) still a WIP