Revert d1cca44..4e477b3

This rolls back to commit d1cca44314c511d100496fcf951885cfef91222a.
big program loader change funtion parameters