functions added, some files removed