adding some more updates for better integration