1.7: Several optimizations + Hours Only versions