Catch Up
core fixes