Added trim in final block