Updated for id to string, finished again ;)