Updated: Fix up poor programming