added currrent bundle and optimized almost all functions to work more oo way.