Edited docs with more considerations