Fixes and New code