some changes
Added the latest functionality