Added more to layer to wave code