This is good for now but will require some modification later due to upstream changes,