removed die statments (from testing)