added more editing support