Tested/Fixed current functionality