Adding florapdx
Amended merge