Issue #1, updated constant variables