Fix Lock + Add CardBox Model