[FIX] Making things better