Reverted Jan's changes