0.5.4 - Intermediary commit