Photoshop CS6.1 includes the ability to create Conditional Actions. This means that you can now create actions that are optimized for certain situations. For instance, you could create a conditional action to create a watermark for either a landscape or portrait photograph.