Merged change from shoey63, updated it again.