third commit. Previous problems fixed