Code

Updated organization handling.