FIX/Optimize computation