Add littel changes and implemented new code