fixed background with tom
merge