Added info, simplified the code