Separated partials respectively and added funtionality