Bug-free Proper Working Version