Dropped old code
Added new code