Make the full package smaler and quicker