incorporated the logic components