Updated Constants and Organization