Updated to v0.5 as per Cheikh's changes