update to have logic (ready for testing)