Update main, added pikking