Mod test
Error fix
Fix NPE
Remove extra and getting warmer