with alert integrated
merged with master