beginning overhaul for flexibilitude