More updates & functional add ins