Removed buggy ID calculations