Modified mainly 4.4