Final Commit - Finished adding the Short Form option