OTB Stack - Revision 2, changed after discussion with TA