Added modified pickup system