Using ramps where possible

Using ramps where possible