Added basic editing