Some unchanged stuff
Fix optmisation