included 6e0r9e's changes