New Entries; Fixing bug