Added simple logic