added shakibs code