Compacted more and possibly more efficent than Version 1?