Did some hacky changes which I will need to undo sometime soon