working.

works properly now.