Maybe a fix to stuff not always firing???