Go for the partition, I hope that would help you to better address this problem.

Sam