Complete workaround. Changed layout and steps