some modifications to make it closer