Added functions
Fixed render bug
Fixed render bug
Fixed render bug