v0.2 - Updated to fill request