Code additions/edits