Updated with new directions