Bug Fixes & Added Visisble field