Optimization and improved @jix