Removed previous outcommented code