added address and fixed bug