major overhaul
fix specs