bug fixing... not finished on MODIFY