lots of changes, picking is broken