Moving code changes to gelam and updating from there