merged gpu additions