Conditional Personal

Added conditions