Added functions for handling courier better.