EDIT: Minor code alteration