Changed interrupt function and others...