Added closes to patch, removed timestampable listener from 320f