Fixed the code now we should all be on equal base