Added todo for layer1