fixed serious stuff