Re-added plot macro (oops!) and added corresponding layer macro.