modified all current work to reflect codeigniter