Looks solid now