updated with latest core15 stuff