more updates and modifications