added rent and optimized todo