debugged
edited for merging
edited changes