Code Command Test + Other Changes