adding some more rubbish logic