Added Base Logic