Changed to align with wbond's recommendations