BUGFIX #1 : Added a render buffer for perfomance issues