Updated some workings