fixed implementation
reactivated functions