added security... not yet finished...