implemented improvements