Added current condition