Placing optimized version (not working correctly)