Improved rendering alot