Protoyype more functions

more changes