Seems like final changes before any bugs will be spotted