add invisibility
fix conflicts