Changed pick up code