Cleaned up code regarding roudntrip and made the jenkins code work