Made Changes for editing