Reverted changes used just for testing