Made changes to not require raptor to be self-linked
Upped version