added current panel access
decoupling