did some work on load step
merged