fixed aboude's errors