Updated to new lang system