Added code from feb18