Edited ORASS builder