changed code around for testing