more prototyping, modified database