(*)merge from KellyBackend project