Additions to input and tightening the pre margins