FIXING IVANS ERRORS AND F***UPS!