[NOT TESTED] Add some logic ... too tired to test now