improved message handling and created bump class