jasmin added and edited