Updated Code

Now supports Categories Selection