Fixed pick status and made more files