Some more edits for functionality