Feature/fix broken proposal take 2 after reversing commit