Fixed things, should be stable at this stage