Updated to match Peacecraft