fixing org stuff