Quick fix/changes