Updated for debug - Justin