Updated with known issues