Removed mapper and short circuit if for testing