Edit 1, removed comments